Merge "Fix issue where sensors wouldn't be reregistered" into qt-r1-dev