Merge "Better transition interruption and TextChange fixes" into klp-dev