Merge changes I7c51f161,I9231f4b4

* changes:
  SF: Remove LayerBE
  SF: Refactor onLayerDisplayed