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

Change-Id: I131324741da2c4c3ed9a3160231bb482d2b0882e