Merge "Allow COPE admin to control screen configuration" into main