Merge "Fix wait/notify logic in GNSS VTS 2.0 test cases" into qt-dev