am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

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