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

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