Merge "Update strings - chooser/resolver WP strings." into sc-dev