Merge "Enhance Settings deep link transition" into tm-dev