Merge "Fix tv edu text drawer not closing completely" into udc-dev