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

Change-Id: Ia744f56107b83b6a5d5e236d24641bd7db71ab02