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

* commit '402099f7861f306c2dd7c561bdc19b8f65d79b65':
  Unhide setPictureListener