[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 am: 7896beee1b -s ours
am skip reason: Change-Id Ib769df4302d1c09166e2dc456b8ced35daa4d0b7 with SHA-1 216c08e460 is in history

Change-Id: I3551b3488f39038c6cac0536197523e17384e0a2