Merge "Handle non-square pixels on External display" into main