Merge "Fix issue where panel opacity could be wrong" into qt-dev
am: 30e9b45cd9

Change-Id: I8e374891a8bb75b390d2c78e23660ff7c65c9795