CC-5632: System preferences don't get saved
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x