Merge "Introduce system shortcut key unit tests"