Merge "Fix issue #38037532: Toasts cause apps to become foreground" into oc-dev
am: 1801f688b9

Change-Id: Ib812e0357e50b5af010552d0ef18d27e071370b2