Improving boolean check for others to piggyback this switch's case
Merge branch 'allow-space-to-select'

* allow-space-to-select:
  Improving boolean check for others to piggyback this switch's case