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

Change-Id: I7c07a165dd882c9d9918c10d9d7071c4f9b9c646