Merge "Merge "Test: Drag on the divider line." am: 1fa3a60f05 am: 290bfff7d0 am: 8ad2dc3615" into oc-mr1-dev-plus-aosp