Merge "SF: Omit layer tree dump if flag is specified"