Merge "Consolidate the update of display orientation and configuration"