Merge "Apply size override for fixed rotation activity" into main