Merge "SF: fixing estimatedDpi checking x twice" into main