Merge "Centralise logic for setting credential manager app"