Merge "On-screen navigation bar (separate from the status bar)."