Merge "Fix camera race condition" into qt-dev