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

Change-Id: I368f1c4158e1a7b209fea067a27930f0723d1c95