Merge "Fix toggles when disallowed by admin" into tm-mainline-prod