Merge "Add a flag to change the screenshot keychord delay"