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

Change-Id: I72e9ac4d9fa24ad8388a44f10eef9201e0684ffa