Merge "Revamp support for keyevent handling." into lmp-mr1-ub-dev