Merge "Upgrade KEYPHRASE permissions to SystemApi" into main