Merge "[ATF-integration] Make sure data can survive render path" into rvc-dev