Merge changes Ib103172b,I2f672fb6

* changes:
  Remove flag for keyguard remote animations [2/n]
  Remove flag for keyguard remote animations [1/n]