Merge "SF: Fix layer outside of viewport test"