Merge "Tethering: fix using wrong subId problem" into qt-dev