Merge "Larger touch targets, snap to persisted value."