Merge "Fix DWB placement in grouped task view"