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

Change-Id: Id34681f4c3033f643aa8251147280b817236f5aa