Merge "Revert "Handle spacebar events."" into nyc-dev