Merge \\"Prevent apps to overlay other apps via toast windows\\" into nyc-mr1-dev am: e2d148b008
am: cd263d56d2

Change-Id: I4971baf5ef2a522f8acea091023936e033f23cea