Merge "Add contrast setting in dev options" into udc-dev