Merge "Don't add intent for entry if there is no registered intent handler"