Merge "Revert "SF: Predict HWC composition strategy"" into tm-dev