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 '47747fd44f3b5e4f37d01055d949eec721490d97':