Merge "SF: Do not duplicate fences per layer per frame" into tm-dev