LPS-43212 "Add Calendar" screen should appear in pop-up, too, for consistency