Merge "Fix #2999258: ANR in Settings after every reboot" into gingerbread