Merge "Notification: The updateLightsLocked method should be called by the NMS.mNotificationLock lock." into main