Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev