Merge "Unbind service only if it was bound" into sc-v2-dev