Merge "Prevent certain actions of app has revoked permissions" into mnc-dev