Merge "Use dedicated thread for sync manager" into pi-dev