Merge "Fix crash in IntentForwarderActivity" into rvc-dev