Merge "Fix bug 5198868 - Showing previous hidden options menu doesn't work"