Merge "Add test annotations for footer redesign" into main