Merge "Fix DPMS.isCredentialManagementApp()"