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