Merge "SF: Fix dumpVisibleLayersProtoInfo"