Merge "Don't animate unlocked screen off if QS is expanded" into tm-dev