Merge "Fix double task bar" into main