Merge "Fix missing calendar controls"