[automerger skipped] Merge "Back porting Dark theme bug fixes from R" into...

[automerger skipped] Merge "Back porting Dark theme bug fixes from R" into qt-qpr1-dev am: d9d21afd -s ours am: 81ef2afa -s ours am: 1b1f7a80 -s ours am: 8198dd74 -s ours
am skip reason: Change-Id I0bee6517b39216146681097262cf55c7192b0131 with SHA-1 1314cf61 is in history

Change-Id: I7981ed3e1e48710b1b8180743d8cb521d3c1349a