Merge "Unhide setPictureListener" into jb-mr1-dev