Merge "Set launch cookie when starting activity from recents" into tm-qpr-dev