Move more of custom SL5 build of SS Client to SL5 PCL provider