Merge "Move foreground check outside of mNotificationLock"