Merge "Dispatch newDisplayLayout in updateDisplayLayout() directly" into sc-dev