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

Change-Id: If05930440d7e095b46a0a65ebe1e03fa1741b02b