Merge "Fix disappearing nav icons."