Merge "Fix subsequent drag-to-open SubMenus" into lmp-mr1-ub-dev