Merge "Add haptic feedback when entering ActionMode" into nyc-dev