Merge "Do not unnecessarily re-inflate camera preview" into qt-dev