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

Change-Id: Ic3c77c08a4726c4ea92d5a84220b9aa185ffdab4