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

Change-Id: If142910eebf83a19e863004592335b38b94e1763