Merge "Screenshot shelf (xml version)" into main