am f95c9aa7: Merge "Don\'t disable animations until screen state is known." into klp-dev

* commit 'f95c9aa7e1229963a4cb92eed46eafc205b03cb3':
  Don't disable animations until screen state is known.