Merge "Update support pref fragment with changes from ag/837605" into nyc-dev