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