Merge "Fix case of Dark theme" into qt-dev am: 093af798e4
am: 1558bcbeec

Change-Id: I42d5f14f11a52ca44210eadda3cba022422b46c4