Merge "Make SharedPreferences check with higher precision"