Merge "Always dismiss split after folded the device" into tm-qpr-dev