Merge "Change SystemUI implementation for prioritized HUNs."