Merge "Update strings with UX mocks" into qt-dev