Merge "Don't bring up Launcher until after boot complete" into froyo