Merge "Merge "Fix unintended preferred activity reset" into rvc-dev am: 69b18e57 am: a0811325 am: ca45c2bf" into rvc-qpr-dev-plus-aosp