Merge "Extend GNSS VTS 2.1 test timeout to 15min"