Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread