Merge "Avoid marking visible regions as dirty when metadata changes" into sc-dev