Also restore column hidden, expanded, order state
(cherry picked from commit 56a5b1e5e5398f818a6b6a2c34ac5c66928e6eb4)