Merge "Fix screenshot shelf colors in dark theme" into 24D1-dev