Merge "Improving PictureListener deprecating comments" into ics-mr1