Merge "Actually do not hold WM lock while closing transaction" into oc-dev