Merge change 25276 into eclair

* changes:
  Use separate resources to control orientation change for car and desk docks.