Merge "Make the tap-to-edit behaviour configurable"