Merge "Winscope: replace isbufferlayer checks with buffer not empty"