Merge "Don't crash legacy apps with revoked "Draw over apps access"" into nyc-dev