Merge "Added display null check to ActivityStackSupervisor.getNextFocusableStackLocked" into pi-dev
am: 473b8b09b0

Change-Id: I7fb50faab7f5eeb760eb698f95ccb03ea95bb38f