split view fix

Change-Id: Ib765656122eaa0caf422d6f4ee0782c453884ec8

Conflicts:

	services/java/com/android/server/am/ActivityManagerService.java