[automerger skipped] Merge "Back porting Dark theme bug fixes from R" into qt-qpr1-dev am: d9d21afdd4 -s ours am: 81ef2afa74 -s ours am: 1b1f7a8025 -s ours am: 8198dd7456 -s ours am: a40961db6e -s ours
am skip reason: Change-Id I0bee6517b39216146681097262cf55c7192b0131 with SHA-1 1314cf615f is in history
Change-Id: I23229d70639c4fd5ddaee6ad1d949292719aed48
This commit is contained in: