Merge "Consolidate onDisplayChange() and updateDisplayInfo()"