Merge "Added display null check to ActivityStackSupervisor.getNextFocusableStackLocked" into pi-dev