Merge "Fix issue where panel opacity could be wrong" into qt-dev