Merge "Correct size compat mode condition of aspect ratio"