Merge "Add a new test target for rollback observer." into main