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

Change-Id: I44aac001f1d5ac7955a44a9039c7cfa8262999e8