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

Change-Id: Iebdd570715abfbcc26e735732927088fe5cdb5a9