Merge "DO NOT MERGE Consider fixed layers when scrolling the edit box." into jb-dev