Avoid obsolete calendar panel renderings to avoid various NPEs.
(#12504,#12667)

Change-Id: Ie0a9a8d9913116520b766062ebabdb771a76d1b6