Merge "Remove dark theme config change restart in WPP2" into main