Merge "SF: Fix incorrect LayerState logs"