Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev
am: 39c3d2cf16

Change-Id: I3ddf7e0ceadd7c179f3c7de198658af190985f1b