Merge "Fix settings NPE crash on launch." into honeycomb