Merge "Show alternate menu panel on devices with menu key" into klp-dev