Merge "Merge "Do not hold WM lock while closing animation transaction" into oc-dev am: ab7eb6de4d am: dcf479e5c0"