am 91feb766: am 43b0ce62: am 05da3280: Merge "Fix warp animation in keyguard" into klp-dev

* commit '91feb766f9b1f121611d26931e6cd65e46ddfd01':
  Fix warp animation in keyguard