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

Change-Id: I73f802b9b1c4acd5b17c706372f42c9e5d388840