Merge "Resolve NPE when mini resolver is rotated" into tm-dev