Merge change 25238 into eclair

* changes:
  Implement issue #1780928: Need support hiding nav keys.