Merge "WM: Make maxAspectRatio work with display cutouts" into pi-dev