Merge "Fixed the behavior for HUNs with fullscreen intents"