Merge "LockscreenShadeTransitionController: extract logic of keyguard and scrims" into tm-dev