Merge "Do not resolve port index for apps not targeting SDK T and beyond" into tm-dev