Merge "Enable group child bg fix when redesign flag is on" into main