Merge "Change drop down strings to "View by ..."" into udc-dev