Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev