Merge "Add tests for missing metadata after renaming to non-hidden" into mainline-prod