Merge "Fix NPE when rotation after split dismissed" into tm-dev