Merge "Add handling for toggling keyboard stashing from the keyboard" into udc-dev