Merge "Add instrumentation tests for list items" into rvc-dev