[geolocation] Fixes for bugs 1029326 and 1022635

maybe `xx` since it's in the list that is specifically set out for user assigned applications?