Merge "Fix situations where the shade wouldn't close." into jb-dev