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

Change-Id: I365b744b6d57ab1ca0d5b36db0fd3aae0da0bc0d