Merge "Handle split rotation in rotation callback"