Merge "NPE in in AppGlobals#getIntCoreSetting" into honeycomb-mr1