Merge "Avoid setting a barrier on layers that will not render frames" into rvc-dev