Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817d0
am: ffbef55373

Change-Id: I77e47932a4a74ddcebf9138b009407f144d5f725