Merge "ClientModeManager: add interface control" into pi-dev