Merge "Fix crash in IntentForwarderActivity" into rvc-dev am: f9a02be5 am: 25d9d08a am: c691919a Change-Id: I3a4c84349eaa45fe2758a75278006d552dd0e04a