Merge "Disable app toggle for some T+ apps" into tm-dev