Merge "Fix zordering of labels higher than screen recording." into main