Merge "Fix NPE when shared connectivity service connected" into main