Merge changes I4454d5e3,Ia849b393

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