Merge "Migrate dark theme settings" into rvc-dev am: 221945ad93

Change-Id: Id4276e42ea5fc8a23c01a8d2d6f96294e03c8302