[automerger skipped] Merge "Apply Dark theme changes when screen off only" into qt-qpr1-dev am: e425a9c8d7 -s ours
am skip reason: Change-Id Ib769df4302d1c09166e2dc456b8ced35daa4d0b7 with SHA-1 216c08e460 is in history

Change-Id: I002d8b2659213671a5eeaa2180bda344d31d070e