Merge "Re-enable nullaway plugin" into main