Merge "Fix thumbnail disappearing during staged split animation" into tm-dev