Merge "Compat: rotate+crop only if app and device orientation doesn't match." into main