Merge "Dark theme settings activity" into qt-qpr1-dev am: 8b95d6ab2a

Change-Id: Iff1b55f02a99f8237b080d1bf31d33749f61ba6d