Merge "Fix bug in IntentForwarderActivity" into rvc-dev am: d4d2427c am: 795db636 am: 7643cad0 Change-Id: I3abd40845367298c024b3f835e433edf58388ccf