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

Change-Id: Ia345f84843f6df7f2e22ffc72988fc56935d9cf4