Merge "Prevent notifications from muting accessibility prompts" into mnc-dev