Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread