Merge "Display SF layer based on size, crop & parent instead of buffer size"