Merge "Allow dismissal of sensitive notification" into nyc-dev