Merge "Update carrier label margin in setDisplayCutout" into main