Merge "Fix contrast tile measurement calculation for folders" into main