Merge "Revert "Add discrete contrast UI slider in the setting"" into udc-dev