am e20c279d: Merge "Fix bug 5198868 - Showing previous hidden options menu doesn\'t work"

* commit 'e20c279d9a6719a7c0d8c6606c7ba1bd207db8d3':
  Fix bug 5198868 - Showing previous hidden options menu doesn't work