Merge "Fixed incorrect color of volume panel after theme change"