Merge "Remove NotificationBlockingHelper"