Merge "Fixes rotation stuck in core without trigger transition."