Merge "SF: Identify layers with buffers when dumping offscreen list"