Merge "[dev_option] Override caption bar inset flags via dev options" into main