Merge "Fix b/262378515: NullPointerException in TabPreference.onDetached()"