am 5e556e60: (-s ours) am 76cf7816: Merge "DO NOT MERGE Consider fixed layers...
am 5e556e60: (-s ours) am 76cf7816: Merge "DO NOT MERGE Consider fixed layers when scrolling the edit box." into jb-dev
* commit '5e556e60':
DO NOT MERGE Consider fixed layers when scrolling the edit box.