Merge "sf-latency: Wait on fence after each drawLayers call"