Merge "Fix crash in IntentForwarderActivity" into rvc-dev am: f9a02be500

Change-Id: I5b789b69535b3fee3b29a6d13ebaafc170cfb96d