Merge "SF: Fix NATIVE_WINDOW_SCALING_MODE_SCALE_CROP" into rvc-dev