Merge "Tilt scale correction for certain resolutions"