Merge "Fix sensor triggering issue" into qt-r1-dev