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 '0b2b235c06f162c19f873da55b0d4d87844ec111':
  Fix issue with extra empty screen left over after widget add cancel (issue 10865959)