Merge "Fixed deadlock between AM and WM when animating pinned stack." into nyc-dev