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

* commit '7b1b0f63bcb76585621e856ecc8c8b71450735ee':
  More fixes for keyguard animations.