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