Merge "Introduce DWAppCompatAspectRatioPolicy" into main