Merge "Fix bug 4807086 - Options menu panel too narrow in landscape"