Merge "Update screenshots in a background thread." into froyo