Merge "Follow-up to "Close notification panel when user button is tapped"" into nyc-dev