Merge "Fix test: LockscreenShadeTransitionControllerTest" into tm-dev