Merge \\"Revert \\"Prevent apps to overlay other apps via toast windows\\"\\" into nyc-mr1-dev am: 78fa7a1b3f
am: d6c4cf03e3

Change-Id: Iebc613fbecb372dbb39a9110c1b3123150b6ce5d