Merge "Move DividerImeController into its own top-level class" into rvc-dev