Merge changes I901908d9,Iac9835ad into oc-dr1-dev

* changes:
  AOD: Fix RemoteInput from dozing
  AOD: Fix janky launch transition from AOD2