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