Merge "Revert "Call handleIncomingUser when making intent""