Merge "Add flag to fetch keyboard shortcuts from system rather than hardcoding." into main