am 2204dc6b: am 7f83b228: Merge "update strings for welcome back" into ub-now-mister-ugly

* commit '2204dc6b63b9e0c681c7280364263dfcbcb3a7bf':
  update strings for welcome back