Merge changes Ic62b7358,Ic3f7e62a into tm-qpr-dev

* changes:
  Fix scrim turning opaque during occlusion animation.
  Delay keyguard hiding until after occlusion animation ends.