Merge "setKeyGrantForApp DELEGATION_CERT_SELECTION" into sc-dev