am 965a65f4: Merge "Update screenshots in a background thread." into froyo