Merge "Make SYSTEM_INTERACTION a SystemApi" into pi-dev