Merge "Add visibility special casing for sdk sandbox" into tm-dev