Merge "Fixed an issue where the notification wasn't clickable"