Merge "Update screenshot shelf UI flag name" into 24D1-dev