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

Change-Id: I91ed3bbc04340a8effda1381a95f239231101b5f