Merge "Fix NPE when deciding whether to defer task stack animation." into pi-dev am: 8faa90beeb
am: 94b669c616

Change-Id: I01ac013bdbe72a0da1eef0a097a56efaa608daa2