Merge "Update screenshot shelf UI flag name" into main