Merge "Fix transitions when communal ktf refactor enabled" into main