[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 skip reason: Change-Id I0bee6517b39216146681097262cf55c7192b0131 with SHA-1 1314cf61 is in history
Change-Id: I3e0ff972b79ebfd04400353876fb69bf86493807