Merge "make sure to unlock the screenshot's buffer on destruction" into jb-mr2-dev