Merge "Fix bug 4595971 - Menu not prepared to be prepared"