Merge "Fix invalid divider state while rotating" into nyc-mr1-dev