Merge "Create KeyboardShortcutsModule and new Flag" into tm-qpr-dev