Merge "sdm: Use FB resolution for virtual display" into dev-1.0