Merge "Fix so that dual access points (AP) works." into qt-dev