Merge "Add Setting for Wet Mode/Touch Lock Mode"