Merge "Set large screen smallest screen width to 600" into udc-dev