Merge "Fix nav bar leak in SystemUI"