am 207b5e17: am 402099f7: Merge "Unhide setPictureListener" into jb-mr1-dev

* commit '207b5e1722dc9349c694285d65a24955b630b54b':
  Unhide setPictureListener