Merge "Fix case of Dark theme" into qt-dev am: 093af798e4
am: 6288f173ed

Change-Id: Ifd7b83d1e1142cfe3c1293ef7d5730112838f9c1