Merge "Refactor to split computeScreenConfigurationLocked"