Merge "Remove HUN when user launches intent from its guts" into rvc-dev am: 89e616fa34

Change-Id: Ia1be9c08fcd1e3686650bbd202ad3f47b461de6d