Merge "Revert "Upgrade manifest target level to 8"" into main