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

Change-Id: I04be9b9286240009dd4e8c6cfd207b04eadf9b5d