Merge "Merge "Toggling minimized state with overview moves divider to correct position" into oc-dev am: 97578e313c" into oc-dev-plus-aosp