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