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

Change-Id: Ic219b5c5d41291009826a066efb798b43a01cc7f