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

Change-Id: I0b957a0a67a9e245d51dce610acef97d6b72fa04