am 019f5892: Merge "Fix issue with extra empty screen left over after widget add cancel (issue 10865959)" into jb-ub-now-indigo-rose

* commit '019f5892b90b4d37ff41d34f12dd0becfff6c5ef':
  Fix issue with extra empty screen left over after widget add cancel (issue 10865959)