Merge "Gallery, we need to talk..." into jb-dev