Merge "Fix StatusBarService deadlock for real this time." into froyo