Merge "Do not hold WM lock while closing animation transaction" into oc-dev