Merge changes from topic "presubmit-am-7ecf61029b34426e9547eba0bed885c9" into sc-mainline-prod

* changes:
  [automerge] [DO NOT MERGE] Use orientation value from config change event 2p: a8e1bbf7c0
  [DO NOT MERGE] Use orientation value from config change event