Merge "Add test for force relayout behavior" into rvc-dev