Revert "[SF] Intersect layers with display frame not bounds"

This reverts commit 40270c68ae95e5bd7338893dccf7dcd64c529445.

Reason for revert: b/160309152

Change-Id: Id441b1ded16369228403da81ea65333020849a59
2 files changed