Merge proposals dependent on lp://staging/~rpg+helper+core/rpg+helper/encounter_ui

lp://staging/~rpg+helper+core/rpg+helper/encounter_ui has no merge proposals.