Merge "update strings for welcome back" into ub-now-mister-ugly