Merge "Add a new group for foreground of multi-window" into main