Merge "Camera: fix null pointer dereference" into qt-dev