am ac8180ac: Merge "Revert "Fix issue of extra blank screen after uninstall (issue 12372657)"" into ub-now-lunchbox

* commit 'ac8180ac7856e4739c147bee3f419b19573c3dae':
  Revert "Fix issue of extra blank screen after uninstall (issue 12372657)"