Merge "Finish unfold transition when screen turns on after half-folded" into tm-dev