Merge "The tiny-back-button bug found its way back in!" into jb-dev