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

Change-Id: I8abccc7a1eae8a25bf23a058d98b812ea8ce40bd