Merge "Update switch status of PrimarySwitchPrefence when disallow by Admin" into tm-dev