Merge "Use orientation value from config change event" into sc-qpr1-dev