Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev