Merge "Fix cell data preference in single sim case" into nyc-dev