Merge pull request #5169 from ligfx/sidevicegbastate SI_DeviceGBA: refactor and make GBASockServer a member rather than parent
