Merge "Fix TV pip menu edu text hidden too soon"