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