Merge "Fix view cookie for Material TabView"