Merge "Remove dark theme config change restart (2/3)" into main