Merge "SF: remove unused variable on chooseCompositionStrategy." into main