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

Change-Id: I10f2dff543f975d92b2b6067867e3619c88261a2