Merge "Fix bug 5124021 - Menu visibility incorrect when restoring ListView selection mode"