Merge "Replace system gallery permission granting with system gallery role."