Merge "Update config from ancestor if it can handle orientation request" into sc-dev