Merge "Remove HUN when user launches intent from its guts" into rvc-dev am: 89e616fa am: 8fca5a15 Change-Id: Ie70015de1d1e9f9adaddc054c4a92ace71ccbc2c