Merge "Fixing a couple of keyboard shortcuts tests." into nyc-mr1-dev