Merge "Actually do not hold WM lock while closing transaction" into oc-dev am: 7831f0c436
am: 06f3e97e3f

Change-Id: I3195d7c680c06513d7c2d6c4a7b6290123841126