Merge "Factor out preference-in-storage check to overridable method." into cm-10.2