Merge "Prevent NPE in DateView"