and fix bug in MenuFloatingWindow::ImplHighlightItem - take this border into account Change-Id: Ieeb5a447ed58f9bb064a8b88aefc5d1b666195f7