Merge "Fix KEYCODE_MENU not being dispatched to an Activity" into lmp-mr1-ub-dev