Merge "Disable strict mode check on shared preferences to avoid logspam" into nyc-dev