Merge "Add mode manager local service interface" into main