Merge "Finish issue #10779747: Calendar Storage crash observed..." into klp-dev