Merge changes Iad608121,Ib998a99b into sc-dev

* changes:
  Fix issues with interrupted screen off animations.
  Update animateScreenOff when AOD preferences change.