Most of this work is related to the qt branch merge, which is tracked at bitmask-vpn#295 (closed)