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