Merge "Fix bug in IntentForwarderActivity" into rvc-dev am: d4d2427c01 am: 795db636b9

Change-Id: Idefd9a79e88df99aed4a4a649402106b50b8ef8b