Merge "Remove HUN when user launches intent from its guts" into rvc-dev am: 89e616fa34 am: 8fca5a15e7 am: 689725d16f am: cbb6d9d0f5

Change-Id: I6596e0dd77afd616c96888acde5b93af40b5d2a0