Fixes #4366, Contextual action bar item calendar does not work
Merge branch 'release'