Merge "[sf] Add layer metadata to HAL classes"