Merge "Use KeyguardStateController to listen for unlocked shade state" into tm-dev