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

* commit 'cd8640fc1a801349e863a7b6270a0702a63c014b':
  Fix issue #5398675: It's (too) easy to keep the navigation bar...