Merge "Prevent cropHint been overwrite by display size." into rvc-dev