Merge "Enable Encryption & Creds UI for Secondary users" into tm-dev