Merge "Potential fix for Settings screen ClassCast exception on the phone."