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

Change-Id: I6550076e6dd6ccb60e8b2c6537660155d2f2fe4a