Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into nyc-mr2-dev
am: a6dbd4934c

Change-Id: If21ce32f0c7e6652a4185c5f10c2157e078f8217