Merge "Mark KQS arrow strings translatable" into main