Fixes #219. Delay rotation until after transition completes