Merge "Fix issue #3343297 Settings force close when try to..." into honeycomb