Merge "Update screenshot UI elevations" into 24D1-dev