Merge "Add haptic feedback on the kg lock icon" into sc-dev