Merge "sthal: fix race condition of amp-ref route" into qt-r1-dev