Merge "Move mCurConnection to the service and rename" into main