am 39f6be12: Merge "More fixes for keyguard animations." into lmp-mr1-dev automerge: 7b1b0f6

* commit '39f6be121627303d9c485832c4b730867151d9f8':
  More fixes for keyguard animations.