Merge "Remove ENR.mStatusBarNotification"