Merge "Avoid nav bar leakage when remove display"