Update some GuiConstants and resubmission pr#6361.