Merge "Adds user id on exception thrown by getSharedPreferences()"