Merge "Fix issue #5398675: It's (too) easy to keep the navigation bar..." into ics-mr0