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