Bug 846079 - New Calendar Loader / Settings Fixes