Merge "Compose QC intent with FLAG_ACTIVITY_SINGLE_TOP" into lmp-dev