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

Change-Id: I735f2fbfd91efb423df042678ac8a45ad6aaa1da