Merge "Merge "Actually do not hold WM lock while closing transaction" into oc-dev am: 7831f0c436 am: e5e4365ba6" into oc-dr1-dev-plus-aosp
am: 1676f81a7a

Change-Id: Ia7cf1b862975da505e3a9898ba8b216d5f91c052