Move adjust position to show to prevent calendar from "bouncing"
Merge branch 'vanilla'