Merge "Removing getSystemPreferredDisplayMode and adding it as part of DynamicDisplayInfo"