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

Change-Id: Ib24633d44b849d3f6c00e24dcb36f357aaee7471