Merge "Fixing bug 2577511 - incorrectly trying to access a setting." into froyo