Merge "Fix Dark theme case" into qt-dev
am: 5bfb9f3240

Change-Id: I3970a16198bb1d023fdd62840e7078883d4726c5