Merge "Fix TetherPreferenceController ANR" into main