Merge "Update inspector view design" into qt-dev