Merge "Fix UI problem in system language list" into udc-dev