Merge "Fix corrupted views in favorite tabs"