Merge "Include whether a mode is active in the subtext of dialog tiles" into main