Merge "Fix "Tab not maintained on rotation""