Merge "Guard mLockscreen in NotificationLogger with correct lock." into main