Condition check for non-Pro was incorrect
Also simplification of some of ?: constructs, that are hard to follow.
Non essential merge, no functionality change: Use one mKeyActions instead of mClickActions, mPressActions
This slightly simplifies the code, for instance handles the non-Pro overrides in one place.