Upgrade went without hiccups, now enjoying Calendar improvements 
Thank you, @dcaliste and whoever has been working on this!
I have this problem, too, on my Xperia X - actually I think it started already with 4.1. Sadly it seems the big improvement re:edge swipes, that arrived in 3.0.2 Oulanka has been lost recently. I hope it can be brought back!