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