Merge "Fix problems with showing/hiding secondary pane in month view"