Merge "Fix MultiAppStartupTest" into froyo