Merge "Allow any non-touchscreen device click to bypass long-press need for shortcuts" into main