Merge "Fix NPE in LockscreenShadeTransitionController" into main