Merge "SF: handle onComposerHalVsyncIdle" into tm-dev