Merge "Refactor keyboard mode holding variables"