Merge "Fix crash in setNewPicture" into jb-dev