Merge "Align multiple admin related strings with UX design" into udc-dev