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

Change-Id: Ie09778df49eaa937b96a38f9c07d27bf87dbfdcf