Merge "Reset override config when clearSizeCompat" into sc-v2-dev