Merge "Fix for menu XML ending with a sub menu" into lmp-mr1-ub-dev