Merge "KeyguardStatusBar: Fix bad state after canceled animation" into nyc-mr1-dev