Merge "Start closing the device immediately in unfold transition test" into tm-qpr-dev