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

Change-Id: I6fdc6a83769768721e80d6331e4ede0dcb496aca