Merge "SF: Modernize task scheduling API" into rvc-dev am: c50b604460 am: 39f2a2ee9e am: 78fd88a019 am: 08178567b2

Change-Id: I816e2a8e44a6dadceebaad23d931f796a6a3bd01