Merge "Correctly update sensor status in restricted mode" into qt-dev