Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev