Merge "Prevent apps to overlay other apps via toast windows" into nyc-mr1-dev