Merge "SF: Modernize task scheduling API" into rvc-dev am: c50b604460

Change-Id: I0baba1eccddd12a7212e1f834ad74f1321183dd2