Merge "Add default_team to flickerapp" into main