Merge "Fix using incorrect view in app language selection" into tm-dev