LPS-48326 KB Display UI cleanup (forward port)