Merge "SF: Fix NATIVE_WINDOW_SCALING_MODE_SCALE_CROP" into rvc-dev am: 33eb6fa898

Change-Id: I8f8da35be3e0fd8047dac5a58418d5104f4c8f14