Merge "[Satellite] Show category of Your data plan with Manual connection type." into main