Merge "Adjust color options to be larger for larger display sizes" into udc-qpr-dev