Merge "Update strings for guest removal affordance and dialog" into lmp-dev