2e5c31f3d6
Mainly for migration process and to avoid breakage on users who doesn't change their granular storage prefs. (cherry picked from commit e5a22eafe72b701ed277d937a5c0f25d84a5eb25)