am 5d2e2c5d: am 5315e31a: am 102cff96: am 47747fd4: am 0b2b235c: am 019f5892: Merge "Fix issue with extra empty screen left over after widget add cancel (issue 10865959)" into jb-ub-now-indigo-rose

* commit '5d2e2c5dc19c7d5d0f2738da9de08d4c36c3cc9e':