Merge "More fixes for keyguard animations." into lmp-mr1-dev