Merge "Fix two pieces of folder jank" into jb-dev