Merge "SF: Enable HWC composition strategy prediction" into tm-dev