Merge "Fixing bug when checking that the target user can handle the intent."