Merge "Hide task bar when folding before the new config renders the correct task bar" into main