Merge "Remove HUN when user launches intent from its guts" into rvc-dev