app: check layer <-> surface assoc more thoroughly